Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 7 Feb 2011 00:54:00 +0000 (16:54 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 7 Feb 2011 00:54:00 +0000 (16:54 -0800)

Trivial merge